<?php
/**
 * Created by PhpStorm.
 * User: Administrator
 * Date: 5/8 0008
 * Time: 16:38
<<<<<<< .mine
 */
namespace Home\Model;
use Think\Model;
class UserModel extends Model {
  public  function  papa(){
      echo 'I\'m model';
  }
}||||||| .r10
 */=======
 */
namespace Home\Model;
use Think\Model;

class UserModel extends Model{
    public  function pa(){
        echo 'woshi model';
    }
}>>>>>>> .r19
